ray fixes all